From 9a7d719155a6b44c8c1cdb6b0dadd7a435f535e3 Mon Sep 17 00:00:00 2001 From: "atse@norwich.uk.xensource.com" Date: Thu, 28 Sep 2006 12:29:52 +0100 Subject: [PATCH] [XM] Remove traceback printing from load/makepolicy.py. Should pass the exception along to xm/main.py to handle properly like the rest of the commands. Signed-off-by: Alastair Tse --- tools/python/xen/xm/loadpolicy.py | 17 +++++++---------- tools/python/xen/xm/makepolicy.py | 15 ++++++--------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/tools/python/xen/xm/loadpolicy.py b/tools/python/xen/xm/loadpolicy.py index 947da2e7fa..807859c02d 100644 --- a/tools/python/xen/xm/loadpolicy.py +++ b/tools/python/xen/xm/loadpolicy.py @@ -31,15 +31,12 @@ def main(argv): if len(argv) != 2: raise OptionError('No policy defined') - try: - load_policy(argv[1]) - - except ACMError: - sys.exit(-1) - except: - traceback.print_exc(limit = 1) + load_policy(argv[1]) if __name__ == '__main__': - main(sys.argv) - - + try: + main(sys.argv) + except Exception, e: + sys.stderr.write('Error: %s\n' % str(e)) + sys.exit(-1) + diff --git a/tools/python/xen/xm/makepolicy.py b/tools/python/xen/xm/makepolicy.py index 5a8fa3d09b..1a81a14eaa 100644 --- a/tools/python/xen/xm/makepolicy.py +++ b/tools/python/xen/xm/makepolicy.py @@ -33,16 +33,13 @@ def main(argv): if len(argv) != 2: raise OptionError('No XML policy file specified') - try: - make_policy(argv[1]) - except ACMError: - sys.exit(-1) - except: - traceback.print_exc(limit=1) - sys.exit(-1) - + make_policy(argv[1]) if __name__ == '__main__': - main(sys.argv) + try: + main(sys.argv) + except Exception, e: + sys.stderr.write('Error: %s\n' % str(e)) + sys.exit(-1) -- 2.30.2